Don't distribute gdbus-generated sources

These are supposed to be regenerated at build time,
to avoid dependencies on the dist-systems glib version.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b4ec377facacf9d86721573bc3d9ef843a482dff..fdbfac5a3abf7afef6f93e1de809b4750213f177 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -906,6 +906,7 @@ gtk_base_c_sources =                \
        $(gtk_clipboard_dnd_c_sources) \
        $(gtk_appchooser_impl_c_sources)
 
+nodist_gtk_c_sources =
 gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)
 
@@ -918,6 +919,9 @@ $(gtk_dbus_built_sources) : Makefile.am gtkdbusinterfaces.xml
        --generate-c-code gtkdbusgenerated \
        $(srcdir)/gtkdbusinterfaces.xml
 
+nodist_gtk_c_sources += $(gtk_dbus_built_sources)
+gtk_all_c_sources += $(gtk_dbus_built_sources)
+
 gtk_os_unix_c_sources =                \
        gtkcustompaperunixdialog.c      \
        gtkpagesetupunixdialog.c        \
@@ -929,8 +933,7 @@ gtk_os_unix_c_sources =             \
        gtkprintoperation-unix.c        \
        gtkprintunixdialog.c            \
         gtkprintbackend.c              \
-       gtksearchenginetracker.c        \
-       $(gtk_dbus_built_sources)
+       gtksearchenginetracker.c
 gtk_all_c_sources += $(gtk_os_unix_c_sources)
 if OS_UNIX
 gtk_private_h_sources += \
@@ -942,8 +945,6 @@ gtk_private_h_sources += \
        gtkprinteroptionwidget.h        \
        gtksearchenginetracker.h
 gtk_c_sources += $(gtk_os_unix_c_sources)
-else
-gtk_c_sources += $(gtk_dbus_built_sources)
 endif
 
 gtk_os_win32_c_sources = \
@@ -1040,14 +1041,12 @@ gtk_built_public_sources =                      \
 
 # built headers that don't get installed
 gtk_built_private_headers =                    \
-       gtkdbusgenerated.h                      \
        gtkresources.h                          \
        gtkmarshalers.h                         \
        gtkbuiltincache.h                       \
        gtkprivatetypebuiltins.h
 
 gtk_built_sources =                            \
-       gtkdbusgenerated.c                      \
        gtkresources.c                          \
        gtktypebuiltins.c                       \
        gtktypefuncs.c                          \
@@ -1083,6 +1082,7 @@ gtk_extra_sources =                               \
 #
 MAINTAINERCLEANFILES = \
        $(gtk_built_sources)                    \
+       $(gtk_dbus_built_sources)               \
        $(stamp_files)                          \
        $(GENERATED_ICONS)                      \
        stock-icons/icon-theme.cache
@@ -1145,7 +1145,10 @@ template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h)
 gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf
 CLEANFILES = $(gen_sources)
 
-BUILT_SOURCES = $(gtk_built_sources) stamp-icons
+BUILT_SOURCES = \
+       $(gtk_built_sources) \
+       $(gtk_dbus_built_sources) \
+       stamp-icons
 
 # all autogenerated files need to be generated in the srcdir,
 # so old versions get remade and are not confused with newer
@@ -1223,6 +1226,7 @@ deprecatedinclude_HEADERS= $(deprecated_h_sources)
 gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
+nodist_libgtk_3_la_SOURCES = $(nodist_gtk_c_sources)
 libgtk_3_la_SOURCES = $(gtk_c_sources)
 libgtk_3_la_LDFLAGS = $(libtool_opts)
 libgtk_3_la_LIBADD = $(libadd)